merge
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Sat, 18 Feb 2006 20:17:24 +0000 (13:17 -0700)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Sat, 18 Feb 2006 20:17:24 +0000 (13:17 -0700)
commit8a5f45ddf8b220fa1d3e8bb5eaeb7573f6f39538
treef80edcecbf455d6ca21264d43d1032be3af44934
parent06c843b557da5437df6b8d07d410143f5dfa16b9
parente814b1b7743c149fec0e1d5ad51fef0f43d9c86d
merge
linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
xen/include/asm-ia64/config.h